Formatting, added a TODO.
Renamed method, improved Javadoc and added test cases.