Added a few more sections and cleaned up the code
Updated code and added sections