I'm also cleaning up these semi-colons...