code cleaning time! :S