Fixed long lines
Fixed long lines
Cleanup
Refactor
Cleanup