Integrated feedback from @aried3r
 - source code formatting
 - variable names changed
 - unnecessary intent extras removed in prestage