Renamed instance and fixed codestyle