starting types and code cleanup