Various formatting issues resolved, e.g. superflous spaces, but also added class names to method names since some methods have the same name in different classes.