Clean up of code but passing now