Formatting, added abstract methods