cleanup and some styles