# Replaced German comments with English comments
# fixed some typos
# organized imports
# added/updated some Javadoc