Adjusted constants according to user feedback, removed unused code