Removed unused method
Added moving constants
Added constants, writing to output file