Improve styling

Close #6