Modifications to resolve comments

Modified all files to resolve majority of @wasade's comments. Will address addtional comments as they occur.