Formatting, added some methods