Just to make source code clearer

Partially closes of #1 ?