[DEV-482] Implement Aaron's suggestions