Fix #3 + code cleanup