Changed tab for spaces and moved the placement of @Override annotations