Fixed small typo, cleaned up the code a little, getting ready for the next stage