Fixed spacing issues
Merged