clean up + some styling