Organized in an cleaner way.