Whitespace
Use ArrayList
Refactor code