Renamed some variables and methods for consistency. Improved javadocs. Code clean-up and simplification.