Javadoc n tidyup horse code