Refactor and get rid of GA params. Closes #50