Finish general refactor, improve general styles