Code Cleanup, grouped explicit and generic data types