Are 1 line if statements the standard for this file? I always find them a bit hard to read....