code formating and added missing @Override annotations