removed unused constants and formatting