Cleaned up #164