Initial commit
Remove several hard-coded values