Added methods and reformatted previous