cleaned up structure
simplified style