Cleaned up to match more common ruby style