code clearing
closed #21