Better order of source code