Apply formatting. Make more methods in Entity virtual