Some small improvements. Removed some unnecessary lines