improve general code readabilty