cleaned up features and steps