made module more semantic