Cleaned up params method