cleaned up features