Removed no longer needed line of code
Improving the dynamicness of code across all files
Reordering code alphebetically