Cleaned up commits per review