Additional desciptions, checkstyle conventions, minor layout adjustments