Getting code to my current standard