Clean up of initial implementation