Removed hard coded settings, improved usage