Removed some linting errors
Added prefix handling
Optimized build