Trimmed some whitespace and removed warnings from compilation