Removed unneseccary methods; fixed some whitespace