An attempt to improve some (maybe)screwed style elements

Fix #99