Refactor Lotus::Entity

Just nitpicking ;)

Thanks for your work! :green_heart: