Cleanup and moving hardcoded paths into variables.