Started some code refactoring
Merge branch 'master' of https://github.com/darkphantom934/Radiation