Fixed minor issues for clean up