Improve style and update index