Updated it again

Formatting, better code.