Code cleanup
Merged master fixed conflict.