Removed unnecessary comment
Removed package name from queries as requeried by JPA
Changed case for query reserved words for better looking