Changed default style a bit and did some refactoring in the code