Transferred String query statements from classes into query.properties file.
Cleaned codes: removed unused variables, edited spacing, moved some class variables into method variables.