Minor cleanup. Works on AWS and local server