Cleaned up grepping a little