Cleanup

Fixed some minor details that annoyed me. Aligned the copyright comments correctly, replaced tabs with spaces and resolved a deprecated method warning.