Commented and cleaned java classes