LRA-86

Remove console.log
Remove 'magic' numbers