Modified cleaner session, cleaned up variables