finished a little more beautification