Cleaned up BufferPool and added method for expanding file