Add function to parse location
Fix some whitespace