Cleaned up the PR a bit