Made some changes to the formatting
Deleted a few functions that were no longer needed.