Code cleanup, comments, center on marker