Code cleanup.
Added safety belt.