moded some line break stuff. Cleaned up code a bit