Removing debug statements + general cleaning