Cleanup markup and styles