code cleanup. unified styles