Some small adjustments (cleaning up things)