Fixed formatting and added some methods.