Added small end changes
Clean up