Removed caption. Code cleanup.