Mostly styling updates and some function cleanup