Minor code edits

Cleaned up development code