Removing Comments + Bug Fix