Fixed Javadoc formatting

All tags are in proper order. Now contains return tags as well.