Cleanup

Removed comments, moved samples into other files, added differentiation
between special call