Cleaned up pricing controller