Removed all warnings except one due to macro use
Removed as many glob inputs as reasonable
Merge pull request #15 from MarkJr94/cleanup

Some basic cleanup