Some light code clean up, comments and review... The code is not that
horrible actually, thought it was much worse when I was putting it all
together...