Refactor: blank lines between struct declarations
Refactor: Replace magic numbers with symbolic constants for keys