readability updates

I made some readability changes to help me understand the code better before trying to add file-object support