clean up
removing unchecked exception in throws
constant is cleaner with  the name in snake case
modification the order by JLS