Fixed #5

Removed obsolete code, made psr-2 compatible