Compiler error fixed. Minor cleanup