Add comments and clean crap out