Shortcut code cleaned.