Add style and small fix... #2