Modifications to drop blank spaces