Refactoring
More work on polygon style (but not there just yet...)