Added return values + some minor alignment issu