Made the code look a bit nicer. Remember to try merging to a solution without the C-type at all