Removed redundant variable
Added final modifier to cell components, and switched lambdas to use Java 8's lambdas
Removed unused code