Adding shortcuts and cleanup