Improved keywords and remove init script