Organization refactor
Remove unneeded constant