Code cleanliness
Merge fix