Improve code-climate score

maybe

Should fix #23 and #21