cleaned up structure of fix args