Cleaned up lines