Cleanup: Removed flow chart comments and added javadoc