Tidy Code

Just clean looking code.