Add genetive
Clean up code