Cleaned up source formatting, and added snapback to map.