Reorganized declarations for ease of read