Remove readable-stream and extra "functions"
Code formatting
Update tests