Removing warnings related to unused variables, coding style