Refactored code, creating many new, small methods; also implemented samJ...

...ackRagePoints