Add empty line to all files
Replace magic number with constant
Rename field
Use interface in declaration
Fix some line length violations