Cleaned some things up.. Still needs more work