Cleaned up minor issues