Code clean up, update styles