Working through some code clean up and promise a+ compliance