Variable renaming, removed two unnecessary functions (Keiler review)