bugfixes, code standardization, refactoring
Merge pull request #5 from opentechinstitute/lisa_bugfixes1

bugfixes, code standardization, refactoring