Some refactoring
Next Try
AAAAAAND!