removed grid class and cleanup of comments