cleaned up style