Moved all constants into header