Align style, cleanup code