Cleanup code

Quoc Huy Nguyen Dinhrequested to merge
cleanup-code into develop

Work in progress Closes #40 (closed) Closes #139 (closed) Closes #133

Edited by Quoc Huy Nguyen Dinh

Merge request reports