Large code cleanup

Adapted code to new nilearn API
Refactored code to name variables properly
Clarified file names