Shortern code again