Cleaned up inline commenting