Cleaning up naming of variables