Added @Overrides and minor changes