Cleaned code up
Made Grid attributes private