Add comments and clean code
Add comments and remove hard-coded values