Removed Constants
Removed extra blank lines