Refactored files
Using 'when', which behaves the same as '(if ... (begin ... ))'
Logic golfing
Correct guile truth
Merge pull request #4 from xcthulhu/files-refactor

Files refactor