Cleaned up for Shalin suggestions