Few styling changes, cleaning up