fixed define constant, formatting