general code cleansing, done with integrating aws for the day