Increased readability and other fixes

I received some more feedback and readability still has been an issue. So I made some major changes to make everything more coherent and easier to read. Let me know what you think. :)