Solved: getting rid of a "If" + improving my code

Printable View