Update style and clear some lint warnings