Minor Bug Fix/ Style Fix