Removed unnecessary comments, and the log.i which was used for debugging