Code clean up and added more content