Cleaned up board class