Cleanup variable names + comments + add javadocs