references restyle and code cleanup