added new style, cleaned up some methods