Cleaning code, trying to make direct areas