Cleaned up some comments, error strings and spacing