Code cleanup and finished adding locations