Cleaned up using Lombok