There are a few semicolons that could be dropped :) Moreover, the last expression doesn't need the ``return`` (again, I know this comes from some Java class, but I think it's nicer to make it look like Scala code :))